git-annex.git
13 months agoMerge branch 'master' into ospath
Joey Hess [Wed, 29 Jan 2025 22:48:02 +0000 (18:48 -0400)]
Merge branch 'master' into ospath

13 months agofix liuxstandalone build
Joey Hess [Wed, 29 Jan 2025 22:12:00 +0000 (18:12 -0400)]
fix liuxstandalone build

13 months agodisable OsPath build flag on windows for now
Joey Hess [Wed, 29 Jan 2025 21:22:21 +0000 (17:22 -0400)]
disable OsPath build flag on windows for now

Test suite failure looks like this:

        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        git-annex: fd:4: Data.ByteString.hGetLine: end of file
        git-annex: user error (git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","hash-object","-w","--no-filters","--stdin-paths"] exited 128)

This is apparently in Git.HashObject, and probably in hashBlob, which uses a
temp file with a name starting with "hash", but I have not been able to tell
what's wrong.

I don't understand where the "\\?" path prefix (windows UNC-style path)
is coming from in the path that gets fed into git hash-file, or why git
hash-file can't open the file.

13 months agoremove temp debugging code
Joey Hess [Wed, 29 Jan 2025 21:19:01 +0000 (17:19 -0400)]
remove temp debugging code

13 months agodebug test suite crash on windows
Joey Hess [Wed, 29 Jan 2025 20:37:54 +0000 (16:37 -0400)]
debug test suite crash on windows

13 months agomore OsPath conversion
Joey Hess [Wed, 29 Jan 2025 20:24:51 +0000 (16:24 -0400)]
more OsPath conversion

Sponsored-by: Kevin Mueller
13 months agoMerge branch 'master' into ospath
Joey Hess [Wed, 29 Jan 2025 19:37:19 +0000 (15:37 -0400)]
Merge branch 'master' into ospath

13 months agofix windows build
Joey Hess [Wed, 29 Jan 2025 19:36:41 +0000 (15:36 -0400)]
fix windows build

13 months agowindows build fix
Joey Hess [Wed, 29 Jan 2025 18:59:00 +0000 (14:59 -0400)]
windows build fix

13 months agofix windows build and clarify comment
Joey Hess [Wed, 29 Jan 2025 18:52:20 +0000 (14:52 -0400)]
fix windows build and clarify comment

13 months agoMerge branch 'master' into ospath
Joey Hess [Wed, 29 Jan 2025 18:24:35 +0000 (14:24 -0400)]
Merge branch 'master' into ospath

13 months agofix fromOsPath on windows
Joey Hess [Wed, 29 Jan 2025 18:19:25 +0000 (14:19 -0400)]
fix fromOsPath on windows

Same reasons as 9c9baf7c6581235643661b94f70f76f8a10ae60e

13 months agofix toOsPath on windows
Joey Hess [Wed, 29 Jan 2025 18:06:54 +0000 (14:06 -0400)]
fix toOsPath on windows

After recent changes to use OsPath, test suite fails on windows with:

Exception: Uneven number of bytes: 5. This is not a Word16 bytestream.

Hopefully this fixes it. The innefficiency of the conversion is
unfortunate.

13 months agoresponse
Joey Hess [Wed, 29 Jan 2025 16:06:22 +0000 (12:06 -0400)]
response

13 months agomore OsPath conversion
Joey Hess [Wed, 29 Jan 2025 15:53:20 +0000 (11:53 -0400)]
more OsPath conversion

Sponsored-by: Nicholas Golder-Manning
13 months agoAdded a comment
dmcardle [Wed, 29 Jan 2025 14:44:38 +0000 (14:44 +0000)]
Added a comment

13 months agoAdded a comment
matrss [Wed, 29 Jan 2025 10:13:59 +0000 (10:13 +0000)]
Added a comment

13 months agoAdded a comment
matrss [Wed, 29 Jan 2025 09:56:13 +0000 (09:56 +0000)]
Added a comment

13 months agoAdded a comment
Atemu [Tue, 28 Jan 2025 21:57:42 +0000 (21:57 +0000)]
Added a comment

13 months ago(no commit message)
jnkl [Tue, 28 Jan 2025 21:32:18 +0000 (21:32 +0000)]

13 months agoAdded a comment
jnkl [Tue, 28 Jan 2025 21:20:17 +0000 (21:20 +0000)]
Added a comment

13 months agomore OsPath conversion
Joey Hess [Tue, 28 Jan 2025 20:31:19 +0000 (16:31 -0400)]
more OsPath conversion

Sponsored-by: Luke T. Shumaker
13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 28 Jan 2025 20:00:09 +0000 (16:00 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agoMerge branch 'master' into ospath
Joey Hess [Tue, 28 Jan 2025 20:00:03 +0000 (16:00 -0400)]
Merge branch 'master' into ospath

13 months agowindows build fix
Joey Hess [Tue, 28 Jan 2025 19:59:45 +0000 (15:59 -0400)]
windows build fix

and a little more bonus RawFilePath conversion

13 months agomore OsPath conversion
Joey Hess [Tue, 28 Jan 2025 19:46:00 +0000 (15:46 -0400)]
more OsPath conversion

Sponsored-by: mycroft
13 months agoMerge /home/joey/tmp/git-annex into ospath
Joey Hess [Tue, 28 Jan 2025 19:29:58 +0000 (15:29 -0400)]
Merge /home/joey/tmp/git-annex into ospath

13 months agoremove Read instance for AssociatedFile
Joey Hess [Tue, 28 Jan 2025 19:29:25 +0000 (15:29 -0400)]
remove Read instance for AssociatedFile

This instance is not used.

13 months agocorrect typo
cwg [Tue, 28 Jan 2025 19:29:21 +0000 (19:29 +0000)]
correct typo

13 months ago(no commit message)
cwg [Tue, 28 Jan 2025 19:18:02 +0000 (19:18 +0000)]

13 months ago(no commit message)
andrew [Tue, 28 Jan 2025 18:07:59 +0000 (18:07 +0000)]

13 months agopoll vote (My phone (or MP3 player))
65.254.22.34 [Tue, 28 Jan 2025 17:09:37 +0000 (17:09 +0000)]
poll vote (My phone (or MP3 player))

13 months agopoll vote (My phone (or MP3 player))
65.254.22.34 [Tue, 28 Jan 2025 17:09:30 +0000 (17:09 +0000)]
poll vote (My phone (or MP3 player))

13 months agocomment
Joey Hess [Tue, 28 Jan 2025 15:57:03 +0000 (11:57 -0400)]
comment

13 months agoupdate
Joey Hess [Tue, 28 Jan 2025 15:38:04 +0000 (11:38 -0400)]
update

13 months agoupdate
Joey Hess [Tue, 28 Jan 2025 15:36:02 +0000 (11:36 -0400)]
update

13 months agocomment
Joey Hess [Tue, 28 Jan 2025 15:12:02 +0000 (11:12 -0400)]
comment

13 months agocomment
Joey Hess [Tue, 28 Jan 2025 14:28:35 +0000 (10:28 -0400)]
comment

13 months agoAdded a comment: Simple config amendment for Apache served repositories
beryllium@5bc3c32eb8156390f96e363e4ba38976567425ec [Tue, 28 Jan 2025 08:34:40 +0000 (08:34 +0000)]
Added a comment: Simple config amendment for Apache served repositories

13 months agomore OsPath conversion
Joey Hess [Mon, 27 Jan 2025 20:55:07 +0000 (16:55 -0400)]
more OsPath conversion

keyFile has a nice improvement; since a Key is a ShortByteString, it can
be converted to an OsPath without needing the copy that was done before.

Unfortunately, fileKey has to convert from a ShortByteString to a
ByteString in order to use attoparsec, and then the results get
converted back to an OsPath, so there are now 2 copies.
Maybe attoparsec will eventually get a ShortByteString API,
see https://github.com/haskell/attoparsec/issues/225

Sponsored-by: Joshua Antonishen
13 months agooptimise literalOsPath
Joey Hess [Mon, 27 Jan 2025 19:54:24 +0000 (15:54 -0400)]
optimise literalOsPath

Taking a ShortByteString and using OverloadedStrings should avoid it
being converted from a String.

The reason there is no IsString instance for OsPath is presumably the
bad behavior of IsString for ByteString on unicode btw. But
literalOsPath won't be used with unicode in git-annex.

Sponsored-by: unqueued
13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 27 Jan 2025 16:23:13 +0000 (12:23 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agocomment
Joey Hess [Mon, 27 Jan 2025 16:19:16 +0000 (12:19 -0400)]
comment

13 months agoAdded a comment
matrss [Mon, 27 Jan 2025 15:26:15 +0000 (15:26 +0000)]
Added a comment

13 months agoAdded a comment
matrss [Mon, 27 Jan 2025 15:14:44 +0000 (15:14 +0000)]
Added a comment

13 months agoAdded a comment
matrss [Mon, 27 Jan 2025 15:08:57 +0000 (15:08 +0000)]
Added a comment

13 months agothoughts
Joey Hess [Mon, 27 Jan 2025 14:37:35 +0000 (10:37 -0400)]
thoughts

13 months agoupdate comment
Joey Hess [Mon, 27 Jan 2025 14:25:55 +0000 (10:25 -0400)]
update comment

13 months agomore OsPath conversion
Joey Hess [Mon, 27 Jan 2025 14:13:43 +0000 (10:13 -0400)]
more OsPath conversion

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 27 Jan 2025 13:35:44 +0000 (09:35 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agofix link
Joey Hess [Mon, 27 Jan 2025 13:35:33 +0000 (09:35 -0400)]
fix link

13 months agoreporting on FTBFS
yarikoptic [Mon, 27 Jan 2025 12:32:32 +0000 (12:32 +0000)]
reporting on FTBFS

13 months agoAdded a comment
matrss [Mon, 27 Jan 2025 11:28:43 +0000 (11:28 +0000)]
Added a comment

13 months agoAdded a comment
Atemu [Sun, 26 Jan 2025 13:30:10 +0000 (13:30 +0000)]
Added a comment

13 months agoAdded a comment
jnkl [Sun, 26 Jan 2025 13:09:05 +0000 (13:09 +0000)]
Added a comment

13 months agoSome clarifications in my reproduce steps about the state of the rsync remote
luciusf [Sun, 26 Jan 2025 11:29:02 +0000 (11:29 +0000)]
Some clarifications in my reproduce steps about the state of the rsync remote

13 months agorename bugs/rsyncurl_without___34____58____34___creates_local_folder_as_repo.mdwn...
luciusf [Sun, 26 Jan 2025 11:19:53 +0000 (11:19 +0000)]
rename bugs/rsyncurl_without___34____58____34___creates_local_folder_as_repo.mdwn to bugs/rsyncurl_without___34____58____34___creates_local_folder_as_remote.mdwn

13 months agoInitial post
luciusf [Sun, 26 Jan 2025 11:18:11 +0000 (11:18 +0000)]
Initial post

13 months ago(no commit message)
goglu6 [Sun, 26 Jan 2025 03:02:03 +0000 (03:02 +0000)]

13 months agoAdded a comment
Atemu [Sun, 26 Jan 2025 02:54:18 +0000 (02:54 +0000)]
Added a comment

13 months agoAdded a comment
Atemu [Sun, 26 Jan 2025 02:36:51 +0000 (02:36 +0000)]
Added a comment

13 months agomore OsPath conversion
Joey Hess [Sat, 25 Jan 2025 15:56:35 +0000 (11:56 -0400)]
more OsPath conversion

13 months agoOsPath conversion
Joey Hess [Sat, 25 Jan 2025 15:53:47 +0000 (11:53 -0400)]
OsPath conversion

Decent win in exportDirectories, since it operates on ShortByteString
end to end now without needing conversion. That made it worth
implementing an OsPath specific code path there.

And ExportLocation already being a ShortByteString is an good example of why
it's a good thing that OsPath uses that!

Sponsored-by: k0ld on Patreon
13 months agoMerge branch 'master' into ospath
Joey Hess [Sat, 25 Jan 2025 14:57:13 +0000 (10:57 -0400)]
Merge branch 'master' into ospath

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Sat, 25 Jan 2025 14:57:07 +0000 (10:57 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agowindows build fix
Joey Hess [Sat, 25 Jan 2025 14:56:54 +0000 (10:56 -0400)]
windows build fix

13 months agomore OsPath conversion
Joey Hess [Sat, 25 Jan 2025 14:54:51 +0000 (10:54 -0400)]
more OsPath conversion

Finally reached Annex code in this conversion.

Sponsored-by: Graham Spencer
13 months ago(no commit message)
jnkl [Sat, 25 Jan 2025 12:00:20 +0000 (12:00 +0000)]

13 months agoAdded a comment
jnkl [Sat, 25 Jan 2025 11:49:29 +0000 (11:49 +0000)]
Added a comment

13 months agoMerge branch 'master' into ospath
Joey Hess [Fri, 24 Jan 2025 20:33:36 +0000 (16:33 -0400)]
Merge branch 'master' into ospath

13 months agoanother windows build fix
Joey Hess [Fri, 24 Jan 2025 20:33:26 +0000 (16:33 -0400)]
another windows build fix

13 months agomore OsPath conversion
Joey Hess [Fri, 24 Jan 2025 20:31:14 +0000 (16:31 -0400)]
more OsPath conversion

Sponsored-by: Leon Schuermann
13 months agoMerge branch 'master' into ospath
Joey Hess [Fri, 24 Jan 2025 19:13:37 +0000 (15:13 -0400)]
Merge branch 'master' into ospath

13 months agomore windows and osx build fixes
Joey Hess [Fri, 24 Jan 2025 19:13:20 +0000 (15:13 -0400)]
more windows and osx build fixes

13 months agomore OsPath conversion
Joey Hess [Fri, 24 Jan 2025 18:49:10 +0000 (14:49 -0400)]
more OsPath conversion

Sponsored-by: Eve
13 months agoMerge branch 'master' into ospath
Joey Hess [Fri, 24 Jan 2025 17:46:34 +0000 (13:46 -0400)]
Merge branch 'master' into ospath

13 months agomore windows and osx build fixes
Joey Hess [Fri, 24 Jan 2025 17:46:13 +0000 (13:46 -0400)]
more windows and osx build fixes

13 months agomore OsPath conversion
Joey Hess [Fri, 24 Jan 2025 17:40:09 +0000 (13:40 -0400)]
more OsPath conversion

About 1/10th done with this I think.

13 months agoMerge branch 'master' into ospath
Joey Hess [Fri, 24 Jan 2025 16:02:35 +0000 (12:02 -0400)]
Merge branch 'master' into ospath

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Fri, 24 Jan 2025 15:39:43 +0000 (11:39 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agowindows and osx build fixes for recent ByteString conversion work
Joey Hess [Fri, 24 Jan 2025 15:37:17 +0000 (11:37 -0400)]
windows and osx build fixes for recent ByteString conversion work

13 months agoavoid build warning on windows
Joey Hess [Fri, 24 Jan 2025 15:33:50 +0000 (11:33 -0400)]
avoid build warning on windows

13 months agoremove a few unused imports on windows
Joey Hess [Fri, 24 Jan 2025 15:32:26 +0000 (11:32 -0400)]
remove a few unused imports on windows

13 months agoAdded a comment
beryllium@5bc3c32eb8156390f96e363e4ba38976567425ec [Fri, 24 Jan 2025 08:04:27 +0000 (08:04 +0000)]
Added a comment

13 months agoAdded a comment
yarikoptic [Thu, 23 Jan 2025 21:33:26 +0000 (21:33 +0000)]
Added a comment

13 months agomore OsPath conversion
Joey Hess [Thu, 23 Jan 2025 20:15:00 +0000 (16:15 -0400)]
more OsPath conversion

Git.Types now uses it, as does TopFilePath, making for plenty of new
compile errors needing fixing.

Sponsored-by: Brock Spratlen
13 months agocomplaining about dead
yarikoptic [Thu, 23 Jan 2025 16:12:18 +0000 (16:12 +0000)]
complaining about dead

13 months agoAdded a comment
yarikoptic [Thu, 23 Jan 2025 15:53:39 +0000 (15:53 +0000)]
Added a comment

13 months agocontinue conversion
Joey Hess [Thu, 23 Jan 2025 15:46:35 +0000 (11:46 -0400)]
continue conversion

Add Utility.OsString, with a special case for length.

13 months agoadd System.FilePath to this conversion
Joey Hess [Thu, 23 Jan 2025 15:07:29 +0000 (11:07 -0400)]
add System.FilePath to this conversion

It seems to make sense to convert both System.Directory and
System.FilePath uses to OsPath in one go. This will generally look like
replacing RawFilePath with OsPath in type signatures, and will be driven
by the now absolutely massive pile of compile errors.

Got a few modules building in this new regime.

Sponsored-by: Jack Hill
13 months agoupdate
Joey Hess [Thu, 23 Jan 2025 14:27:18 +0000 (10:27 -0400)]
update

13 months agostart converting from System.Directory to System.OsPath
Joey Hess [Thu, 23 Jan 2025 14:22:06 +0000 (10:22 -0400)]
start converting from System.Directory to System.OsPath

This is the start of a long road, got the first few files to compile
after this large change.

Sponsored-by: mycroft
13 months agoresponse
Joey Hess [Wed, 22 Jan 2025 20:48:51 +0000 (16:48 -0400)]
response

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 22 Jan 2025 20:42:50 +0000 (16:42 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agoparsePOSIXTime ByteString conversion
Joey Hess [Wed, 22 Jan 2025 20:41:06 +0000 (16:41 -0400)]
parsePOSIXTime ByteString conversion

Some easy (though tiny) speed wins.

Sponsored-by: Luke T. Shumaker on Patreon
13 months agofix reversion
Joey Hess [Wed, 22 Jan 2025 20:28:29 +0000 (16:28 -0400)]
fix reversion

af3b9cbd3647ecfb3f3f6c4008dc9e64f7d42591 lost takeFileName, breaking the
test suite

13 months agoconvert from readFileStrict
Joey Hess [Wed, 22 Jan 2025 20:19:06 +0000 (16:19 -0400)]
convert from readFileStrict

This removes that function, using file-io readFile' instead.

Had to deal with newline conversion, which readFileStrict does on
Windows. In a few cases, that was pretty ugly to deal with.

Sponsored-by: Kevin Mueller
13 months agofix reversion
Joey Hess [Wed, 22 Jan 2025 19:32:21 +0000 (15:32 -0400)]
fix reversion

In 793ddecd4b72a5e4746b3b426d3bca400737118b, writeSshConfig was made to
writeFile a ByteString, which lost the newline conversion on Windows.

Added linesFile to fix it. This will also be useful for other writeFile
conversions.

13 months agoconvert from readFileStrict
Joey Hess [Wed, 22 Jan 2025 19:19:47 +0000 (15:19 -0400)]
convert from readFileStrict

In cases where it reads lines, which needs newline conversion on
windows.

13 months agoconvert from readFileStrict
Joey Hess [Wed, 22 Jan 2025 18:43:37 +0000 (14:43 -0400)]
convert from readFileStrict

More of these still to convert, but need to be careful of newline
translation.